fixed tests and improved views