Fixed Adapter and Controller tests