Add better test coverage before starting on other enhancements (#5)