Finished solver + rake tests