More tests

+ psml reading fix according to tests