Removed Golden Test, multiple updates