Minor Style improvements
Change script naming in Makefile
Decreased validation time by reducing the timeouts