added first test; and first fixes