Update tests and sync method names