added new test and tools