Add Less Expensive test
Add rest test