Updated tests for better local development