Code formatting and fixes in order to execute proper test cases