Separate DB config for test DB
When running specs, use test DB
Minor cleanup, submission version