[#83] Restored some deleted tests
[#83] Code coverage