fixing tests and ordering of putting stuff in dockerfile.