moved test-answers locatio + enhancements