Added tests. Cover analysis shows great coverage of the code.