cleanup
added two more callable tests to see why old MSVC fail