Add test coverage for the few features that are implimented also added

basic clean up