Foxx: Adjusted Tests to @fceller's changes