Updated initial tests - still need improvements)