Got rid of PGP block types

Not worth the effort since most of the block types are exactly the same,
except for 1 value

Hopefully added all major PGP type checks
Added a few more tests to "test" function in the command line