Fixed tests for registration changes