bug fixed and last test done