Started adding tests for #4