Fixed tests
Fixed test coverage and test shortcuts