add some tests and checks