fixed a couple more
one test fixed