fixed tests & removed old tests