! Fixes for controller tests and new @registry annotation for registry keys reset