Adding tests. Struggling with transitive dependencies.