Move tests away from MasonryCore.cpp