Updated Laboration 3 added tests