Add more tests and fix some issues founds while testing