Merge "Added junits to increase coverage"