[0.6] Explicit template stuff
+Just found out that you could define template specializations for a
 whole class, so replaced the old macro with a single line solution
*Sorry for the small commit. Have some irrelevant changes in the test
 script for excuse