Added a faccade layer and cleaned up the tests