Updated to use BaseTest