These tests need to be cleaned up a lot. There is still left over stuff from previous test. TODO -Gagan Saksena
