fixed unit testing, bugs, removed logs