Sync tests with implementation