Added test class, fleshed out skeleton a bit more.