Cleanup and fixed all tests
Merge pull request #227 from sghai/update-os

Updated subnet tests and functions