Resolving issue with Tests