More test and expanded wrapping

Signed-off-by: Søren Ranneries <sranne12@student.aau.dk>
Merge branch 'master' of https://github.com/jbossen/P3-Program