Finished consolidating test code