Fixes tests, a couple of issues and changes default naming.