Fixed tests for now.