Started adding tests

Sprucing up the code along with adding tests.