Add new tests, bootstrap views