Extend and adjusting tests