Transitioning to AMD definitions in modules and tests