More unit tests and framework