Reorganized test files, working on basic service testing