Removed old testing stuff to make the correct stuff more clear