Updated AcceptanceTests