Add test and moved security into proper package.