Features/initial tests