reversed testing related changes to move them elsewhere