Finished update to single directive design

Single directive design and some more complex testing.