Adjusting test

Improving assertions, and removing unnecessary resources