Worked around msvc bug, more tests