Moving tasks to external files
Adding test infrastructure