Few more additions to the family
Moving tests to a seperate file