temporarily remove test-- need to update for refactor