descriptions for tests
move wrapped method to handles
change function names to more declarative style