Update PHPUnit dependency to v4.4.0
Simplify where clause and insert query generation