Tests re-added as per review