Additional settings functionality and start of Unit Tests.