Small simplifications
Decode booleans
Decode lists
Restructure unit tests