Added initial tests;