Added pending tests & adjusted songId type to Long.