More base structure and tests

More base structure and tests