adds tests and files from factorOutOldButtons