Added tests, deleted some