Moved test modules appropriately
Quoted all the hash keys in Filler