Added preset controller and tests