Symbol fixes and new tests