removed comments and revamped exception testing