re-organized tests
tried to add coverage data