Fixed several issues related to the code quality

Extended tests
Less complexity in some methods