Update tests, clean up approach.