Added tests for the Static Facade
Fixed a few issues brought to light from the new tests