test fixed, code added