More tests
u test fixes