added some tests;