Fix bug where two varialbe sub's were not happening

Still had hard coded strings in tests:build for compile rule and in a gsub for the source directory