Finished lab3, added tests