Btter tests and class structure bahaa structure