Fixed incorrect string formatting
Improved test assertions