Further development + minor changes in tests