ticket:2 Changed tests according to bug fixed