updated the tests to be self-contained