Adding tests as subpackage