fixing bugs
additional test