Update tests library to simplify everything