Most part of the code is now covered