Simplify API constructor (4 tests failing.)