Test fixes #1