Use config for tests + small fixes
Merge pull request #61 from falsecz/updated-test-config

Use config for tests + small fixes