Addtional Testing

Added more examples and tests, and made some classes testable