Refactored test_suite. Guess I forgot to add it earlier, whoops, heh heh