Moved testing to Unit test script
Added more tests