Finished testing and fixing bugs for lab6a