Added missing includes and defintions
Added initial decoder unit test