Additions for testing and some misc helper methods