Test tweaks, something is wrong...
Added more tests, including a mock test