Edited unit tests