Few more tests and type checks