Fixed tests...I think