Make TEST_DIR first
Fix Byte Compile Warnings