Fixed issues with creating run targets
Merged with test changes and fixed broken code