Starting to add some tests for functionality already in place.