merged with working tests from the live version of the project