Fixed a large issue and changed tests so they picked the issue up