Added security tests
Streamlined tests slightly