#26 final version tests & views