Adding tests, coverage is now at 98%