Revised methods and new tests
More tweaks, improvements