Changed tabs to spaces
Fixed testing bugs...
Fixed file format to comply with pep8
rebase fix

Fixed file format to comply with pep8
merge