Martijn's test commit