Switch to using tests and removing dependency on class
Modified silk to match new changes