Added some tests based on testbase