added more tests, made test target optional