Fix local test failure and move test to correct package