Removed old test, made new test, need more tests