Fixes testing configuration and adds 2 tests