Merge Development on master

Added tests, removed old references.