final commit, just minor changes. Activated test cases