Splitting unit tests
Tests now passing but more need to be included