Wire up testing and clean up over all app fixing