more tests pass! crazy type matching