polished existing tests