Removed bugs in unitTest