Tests pass 11/04/13