Added unit test + bypass functionality.