Commit 11

Test cases, test suite and few small changes