Fixed tests (for real this time)