Completed tests for basic functionality, adding settings