Add some tests for functionality