More tests
Fix rendering issues