Some code consistency refactorings and added 11 more failing tests cases stub with what I need to test for - will fix to make them pass soon