added more classes to check
modified to be executable