Upped test coverage massively on general views