added tests and removed irrelevant tests