improve code coverage
revamp code coverage merging code
sync
still fixing coverage