Adding unit tests

This is broken, it won't go through!