test fixed
almost finished