[CHORE] Moved some test around.
[F] Adding error handling.