Intercept bug
Renamed and added unit tests