#1024 Fixed broken unit test
#1030 Added test script