added more security stuff for test environment