Finished manual tests and fixed bugs