More tests and stuff... a lot of setback by VS's poor SFINAE