Fixed and extended tests