Added some test files for different test cases
work in progress - unit tests
Commited work in progress in order to merge some special part
Commiting a merge of a couple of lines from the other side