Make test pass for now. Need to refactor