Minor Fixes and first tests with generic phase description