Some changes in Rake (more tools) and the basic Functional Test structure