Fixed tests for #15