Added a few tests throughout to improve code coverage. All tests now pass and code coverage is at 96%.