cleaned up loading for tests