Refactor tests to use core functional test case