Add missing return statements
Port more legacy tests to PHPUnit - WIP