adding and cleanup tests