Minor cleanup, implements codeception.