Update tests, remove unused files