added more organization to secutiry tests