Added simple-tests