Added some defaults
Tests
Tests