Follows the grumpy programmer's methods

From his repository for building testable php applications.
Fixes the table names