Added source files from first working tests