tests added and issues fixed