Removed old code and added a better test level