Updated to include tests