Made test concise
Improved test