Renamed some tests, additional assertions.