a few new and fixed tests