Update unit test to support Fixture & Setup