#88
#88 first run + testing needed
#88
#88
Added ticket #88 tests