Add unit tests for future use