Fixed problem with Test suite