check if test has been taken
fixed merge