Formatted code and finished some tests cases.
Removed some parts of code that should be implemented.