Test name splitting method
Remove methods that should be elsewhere
Add pretty error reporting + test