fixed a few tests
fixed a few tests