Remove dependency on test package