Finished and added test coverage for #34