Melanie controller tests

Please delete branch after merging.