adding more tests and adjusting controllers accordingly
testing adjustments