Fixed solution file to include both tests and implementation.