Added test feature to confirm that all works