move a bit more test code around; tests build again, but action tests need to be written