tests and engine fixed