r3 => r4
Synced errorcodes
Tests are cleaner and expected errorcodes are correct now