Finished cleanup, modified tests, added progress spinner