Changed tests, good commit spot