Fix identation, improvments in tests