Clean-up codebase; addresses pull request #70 feature/additional_tests_part2 suggestions