resolved some broken tests, repo cleanup