Re-enabled all tests and they are passing =D