Tests fixed and working