Combined the test classes into one. Code should be good to go now.