SONAR-5007 - Fixed registration errors and consolidated tests