Moved some library reqs into the right place instead of the test helper.