Test code clean up

- Moved test objects to actual test namespaces.
- Changed vars to appropriate types.
- Removed unnecessary code.