Dev

Add in tests.  See issue tracker for more details.