Fixed tests for #35