dellis/jheister: forgot the test (we did write it before just forgot
    about it)