Better Make/Test scripts