Source code tidy up
Updates junit test suite now certificate of elimination not calculated for trivial eliminations