Fixes failing specs due to changes in timestamp class and filter method

Fixes #1