Made testing a little more oganized