Commit changes from Pete
Adopt osmanager to be able to run tests