Added test runners and removed irrelevant tests