Fix for UnitTests
Fixes for Tests plus new Test for new internal route