Fix quality issues
Fix some test failures
Fix accordion to not create a new user