Feature #53, fixing test