Initial commit with working tests