Made some changes
Merge branch 'UnitTests' of https://github.com/echochamber/l4 into UnitTests