more tests and some fixes on views