Added quick and full tests