more karma tests and tidying
restructuring test files
more karma tests