Added filler instead of "test, test1, test2" etc.

Also fixed some other problems