Removed fake namespacing from tests and reformatted code to PSR-2 coding standards 

From PR #76