cleaned up layout of code on test controller