Adds tests for #21