almost final commit

added more tests