improving tests, fixing views