Update tests to use packages