fixes: all basic tests pass