fix conflicts
some of these tests weren't being run
fix args for assert test