Add test bits
Fix test junk by recreating project.