Fixed some small issues and increased the coverage to 88%