Updated tests regarding to decisions in issue #14