Test
Some fixes