Tests view controller

Check if fit for merging @mapesa, we can create enhancement issues there after