Fixing, more tests.:w