fixed, coming up next: test