Fixed tests for real