fix test and security