updated schemes and added logic testing target