Created Dockerfile, moved and corrected tests