Modified tests to be run as a suite