Added more tests... coverage up to 84%...