Updating to include all tests