Added test and lint