Removed Fluency and fluency tests