Fixed some tests.
Minor fixes
Improved two tests