Improved testkit and Added some tests