removed trifle since it is not ready yet and fixed tests