Add new tests, coverage is now at 28%