Changed remaining(?) tests to use test_work_area