fixed errors, tests now run correctly, updated views