Tests nearly there