tests and small fixed