added unit test; rewrote string parsing; changed last arg to be fifteen minutes