Updated tests cases to avoid problems with automated testing