[#1392] more fixes from awful commit + tests