April 16

added some tests