new entities + new testing api