Restructured test file

Moved file into folder named after class being tested and renamed the
test class after the method being tested in it.