fix template references;
remove test loading from static test path;