Reverted back to old number checking
Moved various test assets to /lib and /vendor