Testing -base

First set of reworked tests.