Fixed some bugs and added to the test script