Cleaning the room
Simplifying enable_if
covering more manipulators in unit test