fixed package structure; properely handle tests