fix tests; no final
cleanup build settings for testing
add tests