Fix tests, remove unused methods