Adding tests and framework