Removed some unused lines, added another simple test that fails.