Remove useless code
Fix test function
Fix target specs