Upped test coverage (which revealed a shit-load of bugs)