Add more tests, fix some views based on tests