Added config handling
Test values included