Rewrite recipes, update tests to remove some external puppet modules dependencies, update tests for OAR 2.5.4