Auto 339 test (ready for review)

Also, moving clean up scripts out of functional folder.