Enhancing A Lightweight Approach to Model Based Testing