Merge pull request #132 from adamretter/develop

Fixed test isolation problems and updated test libs