Cleans up test and code. Everything now working. This is a 'rough' full implementation of the Spider Pattern.