Add incomplete tests from 2014-07-14