more tests and change in base structure