more tests and start work on router