General tests for other modules and few fixes.