blao!
Added Tests
silly
Merge branch 'DoingTests'
Merge branch 'master'