Bug fix
Adding another unittest
Adding mainSourceFile so it can be a library