Tests are passing. Still missing some tests