changed naming conventions somewhat
moved test case to its own file