Re-implemented first 2 tests