cleaned up comments
moved unit tests to their own class