Code cleanup and new tests