Working on unit tests and tweaks.